merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 27 Sep 2011 03:21:54 +0000 (12:21 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 27 Sep 2011 03:21:54 +0000 (12:21 +0900)

Trivial merge